From: Jim Blandy <jimb@redhat.com>
Date: Sat, 22 May 1993 22:09:25 +0000 (+0000)
Subject: * cl.el (cl-floor, cl-ceiling, cl-truncate, cl-round): Renamed
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96093
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=758c80c0f394209f07624fe2342b11c1d1031cb2;p=emacs.git

* cl.el (cl-floor, cl-ceiling, cl-truncate, cl-round): Renamed
	from floor, ceiling, truncate, and round; the old names conflict
	with built-in functions.
---

diff --git a/lisp/cl.el b/lisp/cl.el
index b897603ab47..2d2179b78bc 100644
--- a/lisp/cl.el
+++ b/lisp/cl.el
@@ -1724,7 +1724,7 @@ equal to the real square root of the argument."
                  done   (or (= new approx) (= new (+ approx 1)))
                  approx new)))))
 
-(defun floor (number &optional divisor)
+(defun cl-floor (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding toward minus infinity.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case
@@ -1744,7 +1744,7 @@ DIVISOR defaults to 1.  The remainder is produced as a second value."
                     (let ((q (- (+ q 1))))
                       (values q (- number (* q divisor)))))))))))
 
-(defun ceiling (number &optional divisor)
+(defun cl-ceiling (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding toward plus infinity.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case
@@ -1761,7 +1761,7 @@ DIVISOR defaults to 1.  The remainder is produced as a second value."
                  (t
                   (values (- q) (+ number (* q divisor)))))))))
 
-(defun truncate (number &optional divisor)
+(defun cl-truncate (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding toward zero.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case
@@ -1778,7 +1778,7 @@ DIVISOR defaults to 1.  The remainder is produced as a second value."
                  (t                     ;same as ceiling
                   (values (- q) (+ number (* q divisor)))))))))
 
-(defun round (number &optional divisor)
+(defun cl-round (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding to nearest integer.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case